Merge "Fix DisplayList.CommandSet constructor that causes an OOM" into studio-master-dev